January 2012 - Wine-commits

Francois Gouget : po: Remove English strin gs from the Norwegian Bokmål translation.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 8330a9629d3e8a2f2d33a84b0d1ce6f4cb2ca986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8330a9629d3e8a2f2d33a84b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 23:32:32 2012 +0100 po: Remove English strings from the Norwegian Bokmål translation. --- po/nb_NO.po | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 6a749b4..a8b2093 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -544,7 +544,7 @@ msgstr "Forhåndsvisning" #: comdlg32.rc:267 msgid "AaBbYyZz" -msgstr "AaBbYyZz" +msgstr "" #: comdlg32.rc:268 msgid "Scr&ipt:" @@ -1174,7 +1174,7 @@ msgstr "&Passord:" #: credui.rc:47 msgid "&Remember my password" -msgstr "&Remember my password" +msgstr "" #: credui.rc:27 msgid "Connect to %s" @@ -1329,7 +1329,7 @@ msgstr "Brukervarsel" #: crypt32.rc:55 msgid "On-line Certificate Status Protocol" -msgstr "On-line Certificate Status Protocol" +msgstr "" #: crypt32.rc:56 msgid "Certification Authority Issuer" @@ -2306,7 +2306,7 @@ msgstr "Personlig informasjonsutveksling/PKCS #12 (.pfx, .p12)" #: cryptui.rc:300 msgid "Microsoft Serialized Certificate Store (.sst)" -msgstr "Microsoft Serialized Certificate Store (.sst)" +msgstr "" #: cryptui.rc:308 msgid "" @@ -2694,7 +2694,7 @@ msgstr "Liste over tiltrodde sertifikater (*.stl)" #: cryptui.rc:78 msgid "Microsoft Serialized Certificate Store (*.sst)" -msgstr "Microsoft Serialized Certificate Store (*.sst)" +msgstr "" #: cryptui.rc:79 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" @@ -2966,7 +2966,7 @@ msgstr "Personlig informasjonsutveksling (*.pfx)" #: cryptui.rc:159 msgid "Serialized Certificate Store (*.sst)" -msgstr "Serialized Certificate Store (*.sst)" +msgstr "" #: cryptui.rc:160 msgid "File Format" @@ -3170,7 +3170,7 @@ msgstr "Importer valgte" #: gphoto2.rc:32 msgid "Preview" -msgstr "Preview" +msgstr "" #: gphoto2.rc:33 msgid "Import All" @@ -3178,7 +3178,7 @@ msgstr "Importer alle" #: gphoto2.rc:34 msgid "Skip This Dialog" -msgstr "Skip This Dialog" +msgstr "" #: gphoto2.rc:35 msgid "Exit" @@ -8586,7 +8586,7 @@ msgstr "&Fortsett" #: user32.rc:91 msgid "Select Window" -msgstr "Select Window" +msgstr "" #: user32.rc:69 msgid "&More Windows..." @@ -10246,7 +10246,7 @@ msgstr "" #: cmd.rc:322 msgid "Wine Command Prompt" -msgstr "Wine Command Prompt" +msgstr "" #: cmd.rc:323 #, fuzzy @@ -12550,11 +12550,11 @@ msgstr "VM-størrelse" #: taskmgr.rc:287 msgid "Paged Pool" -msgstr "Paged Pool" +msgstr "" #: taskmgr.rc:288 msgid "NP Pool" -msgstr "NP Pool" +msgstr "" #: taskmgr.rc:289 msgid "Base Pri" @@ -12773,7 +12773,7 @@ msgstr " Vinduinnstillinger " #: winecfg.rc:161 msgid "Automatically capture the &mouse in full-screen windows" -msgstr "Automatically capture the &mouse in full-screen windows" +msgstr "" #: winecfg.rc:162 msgid "Allow the window manager to &decorate the windows" @@ -12914,30 +12914,28 @@ msgid "Show &dot files" msgstr "Vis .-filer" #: winecfg.rc:256 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "" #: winecfg.rc:258 -#, fuzzy msgid "Defaults" -msgstr " Defaults " +msgstr "" #: winecfg.rc:259 msgid "Output device:" -msgstr "Output device:" +msgstr "" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "" #: winecfg.rc:261 msgid "Input device:" -msgstr "Input device:" +msgstr "" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "" #: winecfg.rc:267 msgid "&Test Sound"

1 0

Francois Gouget : po: Remove English strings from the Korean translation.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: b2a34acf282fdb8647889dc7861904ca455bb47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a34acf282fdb8647889dc78… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 23:32:56 2012 +0100 po: Remove English strings from the Korean translation. --- po/ko.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index bf55a74..a2d0d90 100644 --- a/po/ko.po +++ b/po/ko.po @@ -546,7 +546,7 @@ msgstr "샘플" #: comdlg32.rc:267 msgid "AaBbYyZz" -msgstr "AaBbYyZz" +msgstr "" #: comdlg32.rc:268 msgid "Scr&ipt:" @@ -9905,7 +9905,7 @@ msgstr "배치 스크립트 밖의 배치 라벨은 불러올수 없습니다\n" #: cmd.rc:312 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "" #: cmd.rc:313 msgid "%1, Delete" @@ -12421,7 +12421,7 @@ msgstr "화면 해상도 " #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "This is a sample text using 10 point Tahoma" +msgstr "" #: winecfg.rc:182 msgid "DLL overrides"

1 0

Francois Gouget : po: Remove English strings from the Japanese translation.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: e475ccbdad300940729728fda78e65374d19c2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e475ccbdad300940729728fda… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 23:33:15 2012 +0100 po: Remove English strings from the Japanese translation. --- po/ja.po | 68 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/po/ja.po b/po/ja.po index 25674e4..598453c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -85,7 +85,7 @@ msgstr "発行元:" #: appwiz.rc:78 winefile.rc:172 msgid "Version:" -msgstr "Version:" +msgstr "" #: appwiz.rc:79 msgid "Contact:" @@ -101,7 +101,7 @@ msgstr "サポート電話:" #: appwiz.rc:82 msgid "Readme:" -msgstr "Readme:" +msgstr "" #: appwiz.rc:83 msgid "Product Updates:" @@ -276,7 +276,7 @@ msgstr "音声" #: avifil32.rc:33 msgid "Wine AVI-default-filehandler" -msgstr "Wine AVI-default-filehandler" +msgstr "" #: avifil32.rc:34 msgid "uncompressed" @@ -547,7 +547,7 @@ msgstr "サンプル" #: comdlg32.rc:267 msgid "AaBbYyZz" -msgstr "AaBbYyZz" +msgstr "" #: comdlg32.rc:268 msgid "Scr&ipt:" @@ -716,7 +716,7 @@ msgstr "サイズ(&Z):" #: comdlg32.rc:412 msgid "&Source:" -msgstr "&Source:" +msgstr "" #: comdlg32.rc:417 msgid "P&ortrait" @@ -2205,11 +2205,11 @@ msgstr "" #: cryptui.rc:296 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" -msgstr "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" +msgstr "" #: cryptui.rc:298 msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" -msgstr "Personal Information Exchange/PKCS #12 (.pfx, .p12)" +msgstr "" #: cryptui.rc:300 msgid "Microsoft Serialized Certificate Store (.sst)" @@ -2351,15 +2351,15 @@ msgstr "形式を選択してください:" #: cryptui.rc:405 msgid "&DER-encoded X.509 (.cer)" -msgstr "&DER-encoded X.509 (.cer)" +msgstr "" #: cryptui.rc:407 msgid "Ba&se64-encoded X.509 (.cer):" -msgstr "Ba&se64-encoded X.509 (.cer):" +msgstr "" #: cryptui.rc:409 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" -msgstr "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" +msgstr "" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -2367,7 +2367,7 @@ msgstr "可能ならば証明パス中のすべての証明書を含める(&I)" #: cryptui.rc:413 msgid "&Personal Information Exchange/PKCS #12 (.pfx)" -msgstr "&Personal Information Exchange/PKCS #12 (.pfx)" +msgstr "" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -2585,7 +2585,7 @@ msgstr "X.509 証明書 (*.cer; *.crt)" #: cryptui.rc:75 msgid "Personal Information Exchange (*.pfx; *.p12)" -msgstr "Personal Information Exchange (*.pfx; *.p12)" +msgstr "" #: cryptui.rc:76 cryptui.rc:155 msgid "Certificate Revocation List (*.crl)" @@ -2601,7 +2601,7 @@ msgstr "Microsoft シリアル化された証明書ストア (*.sst)" #: cryptui.rc:79 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" -msgstr "CMS/PKCS #7 Messages (*.spc; *.p7b)" +msgstr "" #: cryptui.rc:81 msgid "Please select a file." @@ -2645,11 +2645,11 @@ msgstr "証明書失効リスト" #: cryptui.rc:93 msgid "CMS/PKCS #7 Message" -msgstr "CMS/PKCS #7 Message" +msgstr "" #: cryptui.rc:94 msgid "Personal Information Exchange" -msgstr "Personal Information Exchange" +msgstr "" #: cryptui.rc:96 msgid "The import was successful." @@ -2850,19 +2850,19 @@ msgstr "指定した名前はすでに存在します。ファイルを置き換 #: cryptui.rc:153 msgid "DER-Encoded Binary X.509 (*.cer)" -msgstr "DER-Encoded Binary X.509 (*.cer)" +msgstr "" #: cryptui.rc:154 msgid "Base64-Encoded X.509 (*.cer)" -msgstr "Base64-Encoded X.509 (*.cer)" +msgstr "" #: cryptui.rc:157 msgid "CMS/PKCS #7 Messages (*.p7b)" -msgstr "CMS/PKCS #7 Messages (*.p7b)" +msgstr "" #: cryptui.rc:158 msgid "Personal Information Exchange (*.pfx)" -msgstr "Personal Information Exchange (*.pfx)" +msgstr "" #: cryptui.rc:159 msgid "Serialized Certificate Store (*.sst)" @@ -7743,11 +7743,11 @@ msgstr "Wine ライセンス(&L)" #: shell32.rc:338 msgid "Running on %s" -msgstr "Running on %s" +msgstr "" #: shell32.rc:339 msgid "Wine was brought to you by:" -msgstr "Wine was brought to you by:" +msgstr "" #: shell32.rc:347 msgid "" @@ -8293,7 +8293,7 @@ msgstr "続ける(&C)" #: user32.rc:91 msgid "Select Window" -msgstr "Select Window" +msgstr "" #: user32.rc:69 msgid "&More Windows..." @@ -9992,7 +9992,7 @@ msgstr "CMD バージョン %1!S!\n" #: cmd.rc:324 msgid "More? " -msgstr "More? " +msgstr "" #: cmd.rc:325 msgid "The input line is too long.\n" @@ -10384,15 +10384,15 @@ msgstr "'%s' は見つかりませんでした" #: notepad.rc:82 msgid "Unicode (UTF-16)" -msgstr "Unicode (UTF-16)" +msgstr "" #: notepad.rc:83 msgid "Unicode (UTF-16 big-endian)" -msgstr "Unicode (UTF-16 big-endian)" +msgstr "" #: notepad.rc:84 msgid "Unicode (UTF-8)" -msgstr "Unicode (UTF-8)" +msgstr "" #: notepad.rc:91 msgid "" @@ -12403,10 +12403,6 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU Lesser General Public License as published by the " -"Free Software Foundation; either version 2.1 of the License, or (at your " -"option) any later version." #: winecfg.rc:134 msgid "Windows registration information" @@ -12476,7 +12472,7 @@ msgstr "画面の解像度(&R)" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "This is a sample text using 10 point Tahoma" +msgstr "" #: winecfg.rc:182 msgid "DLL overrides" @@ -12568,7 +12564,7 @@ msgstr "詳細を表示(&A)" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12984,11 +12980,11 @@ msgstr "ポップアップ" #: wineconsole.rc:67 msgid "&Control" -msgstr "&Control" +msgstr "" #: wineconsole.rc:68 msgid "S&hift" -msgstr "S&hift" +msgstr "" #: wineconsole.rc:69 msgid "Quick edit" @@ -13450,7 +13446,7 @@ msgstr "変更日" #: winefile.rc:115 msgid "Index/Inode" -msgstr "Index/Inode" +msgstr "" #: winefile.rc:120 msgid "%1 of %2 free" @@ -13557,7 +13553,7 @@ msgstr "WineMine" #: winemine.rc:28 msgid "Nobody" -msgstr "Nobody" +msgstr "" #: winemine.rc:29 msgid "Copyright 2000 Joshua Thielen"

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSTATEBLOCKTYPE typedef.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: ed417a6f136cf0c5e9938272f9b66a2bd10acf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed417a6f136cf0c5e9938272f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:39 2012 +0100 wined3d: Get rid of the WINED3DSTATEBLOCKTYPE typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/stateblock.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/stateblock.c | 20 ++++++++++---------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 17 ++++++++--------- 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e631cec..91942e1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1622,7 +1622,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *if } wined3d_mutex_lock(); - hr = wined3d_stateblock_create(This->wined3d_device, (WINED3DSTATEBLOCKTYPE)Type, &stateblock); + hr = wined3d_stateblock_create(This->wined3d_device, (enum wined3d_stateblock_type)Type, &stateblock); if (FAILED(hr)) { wined3d_mutex_unlock(); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 06f8aed..6ecf596 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -150,7 +150,7 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Im { wined3d_mutex_lock(); hr = wined3d_stateblock_create(device->wined3d_device, - (WINED3DSTATEBLOCKTYPE)type, &stateblock->wined3d_stateblock); + (enum wined3d_stateblock_type)type, &stateblock->wined3d_stateblock); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index afe6c32..5099114 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -922,7 +922,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, { restore_state = TRUE; - if (FAILED(hr = wined3d_stateblock_create(This->wined3d_device, WINED3DSBT_ALL, &stateblock))) + if (FAILED(hr = wined3d_stateblock_create(This->wined3d_device, WINED3D_SBT_ALL, &stateblock))) { ERR("Failed to create stateblock, hr %#x.\n", hr); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 075b0bf5..6595422 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3915,7 +3915,7 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) if (device->isRecordingState) return WINED3DERR_INVALIDCALL; - hr = wined3d_stateblock_create(device, WINED3DSBT_RECORDED, &stateblock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &stateblock); if (FAILED(hr)) return hr; @@ -5609,7 +5609,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } /* Note: No parent needed for initial internal stateblock */ - hr = wined3d_stateblock_create(device, WINED3DSBT_INIT, &device->stateBlock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); if (FAILED(hr)) ERR("Resetting the stateblock failed with error %#x.\n", hr); else @@ -5902,7 +5902,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } device->blitter = adapter->blitter; - hr = wined3d_stateblock_create(device, WINED3DSBT_INIT, &device->stateBlock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); if (FAILED(hr)) { WARN("Failed to create stateblock.\n"); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 59bb841..b00fb84 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -924,8 +924,8 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo unsigned int i; DWORD map; - TRACE("Applying stateblock %p to device %p.\n", stateblock, device); - TRACE("Blocktype: %#x.\n", stateblock->blockType); + TRACE("Applying stateblock %p of type %#x to device %p.\n", + stateblock, stateblock->blockType, device); if (stateblock->changed.vertexShader) wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader); @@ -1105,7 +1105,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) TRACE("stateblock %p.\n", stateblock); - stateblock->blockType = WINED3DSBT_INIT; + stateblock->blockType = WINED3D_SBT_INIT; memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL)); memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); @@ -1337,7 +1337,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, - struct wined3d_device *device, WINED3DSTATEBLOCKTYPE type) + struct wined3d_device *device, enum wined3d_stateblock_type type) { unsigned int i; HRESULT hr; @@ -1354,26 +1354,26 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, hr = stateblock_allocate_shader_constants(stateblock); if (FAILED(hr)) return hr; - /* The WINED3DSBT_INIT stateblock type is used during initialization to + /* The WINED3D_SBT_INIT stateblock type is used during initialization to * produce a placeholder stateblock so other functions called can update a * state block. */ - if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; + if (type == WINED3D_SBT_INIT || type == WINED3D_SBT_RECORDED) return WINED3D_OK; TRACE("Updating changed flags appropriate for type %#x.\n", type); switch (type) { - case WINED3DSBT_ALL: + case WINED3D_SBT_ALL: stateblock_init_lights(stateblock, device->stateBlock->state.light_map); stateblock_savedstates_set_all(&stateblock->changed, device->d3d_vshader_constantF, device->d3d_pshader_constantF); break; - case WINED3DSBT_PIXELSTATE: + case WINED3D_SBT_PIXEL_STATE: stateblock_savedstates_set_pixel(&stateblock->changed, device->d3d_pshader_constantF); break; - case WINED3DSBT_VERTEXSTATE: + case WINED3D_SBT_VERTEX_STATE: stateblock_init_lights(stateblock, device->stateBlock->state.light_map); stateblock_savedstates_set_vertex(&stateblock->changed, device->d3d_vshader_constantF); break; @@ -1390,7 +1390,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, } HRESULT CDECL wined3d_stateblock_create(struct wined3d_device *device, - WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock) + enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock) { struct wined3d_stateblock *object; HRESULT hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 08a1bac..c9d1208 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2310,7 +2310,7 @@ struct wined3d_stateblock { LONG ref; /* Note: Ref counting not required */ struct wined3d_device *device; - WINED3DSTATEBLOCKTYPE blockType; + enum wined3d_stateblock_type blockType; /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 10a91e5..f1e389d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -710,15 +710,14 @@ enum wined3d_query_type #define WINED3DISSUE_END (1 << 0) #define WINED3DGETDATA_FLUSH (1 << 0) -typedef enum _WINED3DSTATEBLOCKTYPE +enum wined3d_stateblock_type { - WINED3DSBT_INIT = 0, - WINED3DSBT_ALL = 1, - WINED3DSBT_PIXELSTATE = 2, - WINED3DSBT_VERTEXSTATE = 3, - WINED3DSBT_RECORDED = 4, /* WineD3D private */ - WINED3DSBT_FORCE_DWORD = 0xffffffff -} WINED3DSTATEBLOCKTYPE; + WINED3D_SBT_INIT = 0, + WINED3D_SBT_ALL = 1, + WINED3D_SBT_PIXEL_STATE = 2, + WINED3D_SBT_VERTEX_STATE = 3, + WINED3D_SBT_RECORDED = 4, /* WineD3D private */ +}; typedef enum _WINED3DDECLMETHOD { @@ -2292,7 +2291,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, - WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock); + enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock);

1 0

André Hentschel : winedbg: Remove superfluous break instruction.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 2c568309e3cc026f1924ff4b09268e4c9d4ae0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c568309e3cc026f1924ff4b0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:22:09 2012 +0100 winedbg: Remove superfluous break instruction. --- programs/winedbg/crashdlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 27de37d..1f2542e 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -134,7 +134,6 @@ static void load_crash_log( HANDLE file ) while (ReadFile( file, crash_log + pos, size - pos - 1, &len, NULL ) && len) { pos += len; - break; if (pos == size - 1) crash_log = HeapReAlloc( GetProcessHeap(), 0, crash_log, size *= 2 ); } crash_log[pos] = 0;

1 0

André Hentschel : winedbg: Adjust button size to fit more translations.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 5e9b57d5b6fc3904da66413ef5c3d32f1dd3eaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9b57d5b6fc3904da66413ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:30:42 2012 +0100 winedbg: Adjust button size to fit more translations. --- programs/winedbg/winedbg.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 314500c..2e83cda 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -68,6 +68,6 @@ BEGIN then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> \ and attach that file to the report.", IDC_STATIC_TXT2,"SysLink",0,6,185,288,32 - DEFPUSHBUTTON "Close", IDOK, 236, 220, 60, 16, WS_TABSTOP - PUSHBUTTON "&Save As...", ID_SAVEAS, 172, 220, 60, 16, WS_TABSTOP + DEFPUSHBUTTON "Close", IDOK, 226, 220, 70, 16, WS_TABSTOP + PUSHBUTTON "&Save As...", ID_SAVEAS, 152, 220, 70, 16, WS_TABSTOP END

1 0

Dmitry Timoshkov : kernel32: Remove a no longer needed todo_wine.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: d50814846ee4fd58287767c918769cce8096c495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50814846ee4fd58287767c91… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 18 19:18:50 2012 +0800 kernel32: Remove a no longer needed todo_wine. --- dlls/kernel32/tests/virtual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index eb213a6..915f92d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2188,7 +2188,6 @@ static void test_mapping(void) /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ if (!ret && page_prot[k] == PAGE_EXECUTE_WRITECOPY) { - todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n"); continue; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: f979e2d3b5ee615effcfcedb8b10c699b761534f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f979e2d3b5ee615effcfcedb8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jan 17 22:21:30 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4ffc87b..c5d49d1 100644 --- a/po/lt.po +++ b/po/lt.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-01-16 21:21+0300\n" +"PO-Revision-Date: 2012-01-17 22:20+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -42,9 +42,8 @@ msgstr "" "spauskite „Pakeisti/pašalinti“." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Priežiūros informacija" +msgstr "&Priežiūros informacija" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3497,12 +3496,11 @@ msgstr "Negalima turėti „continue“ ne cikle" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Žymė apibrėžta iš naujo" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "Failas nerastas" +msgstr "Žymė nerasta" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -13221,7 +13219,6 @@ msgstr "" "dėl nepatogumų." #: winedbg.rc:54 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13229,20 +13226,15 @@ msgid "" msgstr "" "Programos problemos ar Wine trūkumai gali būti to priežastimi. Jūs turbūt " "norėsite patikrinti <a href=\"http://appdb.winehq.org\">programų duomenų " -"bazę</a> dėl patarimų apie šios programos vykdymą.\n" -"\n" -"Jei šios problemos nėra Windows sistemoje ir apie ją dar nebuvo pranešta, " -"galite <a href=\"http://wiki.winehq.org/Bugs\">užregistruoti klaidą</a>." +"bazę</a> dėl patarimų apie šios programos vykdymą." #: winedbg.rc:57 -#, fuzzy msgid "Show &Details" -msgstr "&Išsamus" +msgstr "Rodyti &išsamiau" #: winedbg.rc:62 -#, fuzzy msgid "Program Error Details" -msgstr "Programos klaida" +msgstr "Išsamiau apie programos klaidą" #: winedbg.rc:69 msgid "" @@ -13251,6 +13243,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Jei šios problemos nėra Windows sistemoje ir apie ją dar nebuvo pranešta, " +"galite išsaugoti išsamią informaciją į failą naudodami mygtuką „Išsaugoti " +"kaip“, tada <a href=\"http://wiki.winehq.org/Bugs\">užregistruoti klaidą</a> " +"ir prikabinti tą failą prie pranešimo." #: winedbg.rc:35 msgid "Wine program crash" @@ -13265,9 +13261,8 @@ msgid "(unidentified)" msgstr "(nenustatytas)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Nepavyko sukurti\n" +msgstr "Nepavyko išsaugoti" #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 2c38ea08b865cf29211c7d5de2a197306ef3820c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c38ea08b865cf29211c7d5de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 17 21:55:16 2012 +0100 po: Update French translation. --- po/fr.po | 40 +++++++++++++++------------------------- 1 files changed, 15 insertions(+), 25 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5dc4b5c..9995608 100644 --- a/po/fr.po +++ b/po/fr.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-01-12 21:08+0100\n" +"PO-Revision-Date: 2012-01-17 21:53+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -40,9 +40,8 @@ msgstr "" "la liste et cliquez sur Supprimer ou Modifier respectivement." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Informations de support" +msgstr "Inf&ormations de support" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3505,20 +3504,19 @@ msgstr "Constante chaîne de caractères non clôturée" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "« break » impossible à l'extérieur d'une boucle" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "« continue » impossible à l'extérieur d'une boucle" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Étiquette redéfinie" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "Fichier introuvable" +msgstr "Étiquette introuvable" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -13159,7 +13157,6 @@ msgid "Command history" msgstr "Historique des commandes" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" msgstr "&Nombre de commandes mémorisées :" @@ -13184,12 +13181,10 @@ msgid "Buffer zone" msgstr "Taille mémoire tampon écran" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "&Largeur :" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "Ha&uteur :" @@ -13198,12 +13193,10 @@ msgid "Window size" msgstr "Taille de la fenêtre" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "La&rgeur :" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "Hau&teur :" @@ -13359,7 +13352,6 @@ msgstr "" "somme désolés pour le désagrément subi." #: winedbg.rc:54 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13368,21 +13360,15 @@ msgstr "" "Cela peut être causé par une erreur dans le programme ou un défaut dans " "Wine. Vous pouvez consulter la <a href=\"http://appdb.winehq.org\">base de " "données d'applications</a> pour obtenir des conseils sur la façon d'exécuter " -"cette application.\n" -"\n" -"Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " -"vous pouvez <a href=\"http://wiki.winehq.org/Bugs\">soumettre un rapport " -"d'anomalie</a>." +"cette application." #: winedbg.rc:57 -#, fuzzy msgid "Show &Details" -msgstr "&Détails" +msgstr "Afficher les &détails" #: winedbg.rc:62 -#, fuzzy msgid "Program Error Details" -msgstr "Erreur du programme" +msgstr "Détails de l'erreur du programme" #: winedbg.rc:69 msgid "" @@ -13391,6 +13377,11 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, " +"vous pouvez enregistrer les informations détaillées dans un fichier en " +"utilisant le bouton « Enregistrer sous », et ensuite <a href=\"http://wiki." +"winehq.org/Bugs\">soumettre un rapport d'anomalie</a> en y attachant ledit " +"fichier." #: winedbg.rc:35 msgid "Wine program crash" @@ -13405,9 +13396,8 @@ msgid "(unidentified)" msgstr "(non identifié)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Erreur lors de la création\n" +msgstr "Erreur lors de l'enregistrement" #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Nikolay Sivov : msi: Support MSIPATCH_DATATYPE_XMLBLOB when testing for applicable patch.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 123eba280124f4f3a520a333fed8119bd560c09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=123eba280124f4f3a520a333f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 17 22:07:11 2012 +0300 msi: Support MSIPATCH_DATATYPE_XMLBLOB when testing for applicable patch. --- dlls/msi/msi.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index fd2315f..941a547 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -42,6 +42,9 @@ #include "wintrust.h" #include "softpub.h" +#include "initguid.h" +#include "msxml2.h" + #include "wine/debug.h" #include "wine/unicode.h" @@ -304,7 +307,6 @@ done: return r; } - static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_codes ) { MSIHANDLE patch, info = 0; @@ -580,17 +582,63 @@ static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch ) return r; } +/* IXMLDOMDocument should be set to XPath mode already */ +static UINT MSI_ApplicablePatchXML( MSIPACKAGE *package, IXMLDOMDocument *desc ) +{ + static const WCHAR queryW[] = {'M','s','i','P','a','t','c','h','/', + 'T','a','r','g','e','t','P','r','o','d','u','c','t','/', + 'T','a','r','g','e','t','P','r','o','d','u','c','t','C','o','d','e',0}; + UINT r = ERROR_FUNCTION_FAILED; + IXMLDOMNodeList *list; + LPWSTR product_code; + IXMLDOMNode *node; + HRESULT hr; + BSTR s; + + product_code = msi_dup_property( package->db, szProductCode ); + if (!product_code) + { + /* FIXME: the property ProductCode should be written into the DB somewhere */ + ERR("no product code to check\n"); + return ERROR_SUCCESS; + } + + s = SysAllocString(queryW); + hr = IXMLDOMDocument_selectNodes( desc, s, &list ); + SysFreeString(s); + if (hr != S_OK) + return ERROR_INVALID_PATCH_XML; + + while (IXMLDOMNodeList_nextNode( list, &node ) == S_OK && r != ERROR_SUCCESS) + { + hr = IXMLDOMNode_get_text( node, &s ); + IXMLDOMNode_Release( node ); + if (!strcmpW( s, product_code )) r = ERROR_SUCCESS; + SysFreeString(s); + } + IXMLDOMNodeList_Release( list ); + + if (r != ERROR_SUCCESS) + TRACE("patch not applicable\n"); + + msi_free( product_code ); + return r; +} + static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCHSEQUENCEINFOW *info ) { + IXMLDOMDocument *desc = NULL; DWORD i; + if (count > 1) + FIXME("patch ordering not supported\n"); + for (i = 0; i < count; i++) { switch (info[i].ePatchDataType) { case MSIPATCH_DATATYPE_PATCHFILE: { - FIXME("patch ordering not supported\n"); if (MSI_ApplicablePatchW( package, info[i].szPatchData ) != ERROR_SUCCESS) { info[i].dwOrder = ~0u; @@ -603,6 +651,45 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH } break; } + case MSIPATCH_DATATYPE_XMLBLOB: + { + VARIANT_BOOL b; + HRESULT hr; + BSTR s; + + if (!desc) + { + hr = CoCreateInstance( &CLSID_DOMDocument30, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&desc ); + if (hr != S_OK) + { + ERR("failed to create DOMDocument30 instance, 0x%08x\n", hr); + return ERROR_FUNCTION_FAILED; + } + } + + s = SysAllocString( info[i].szPatchData ); + hr = IXMLDOMDocument_loadXML( desc, s, &b ); + SysFreeString( s ); + if ( hr != S_OK ) + { + ERR("failed to parse patch description\n"); + IXMLDOMDocument_Release( desc ); + break; + } + + if (MSI_ApplicablePatchXML( package, desc ) != ERROR_SUCCESS) + { + info[i].dwOrder = ~0u; + info[i].uStatus = ERROR_PATCH_TARGET_NOT_FOUND; + } + else + { + info[i].dwOrder = i; + info[i].uStatus = ERROR_SUCCESS; + } + break; + } default: { FIXME("patch data type %u not supported\n", info[i].ePatchDataType); @@ -611,11 +698,15 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH break; } } + TRACE("szPatchData: %s\n", debugstr_w(info[i].szPatchData)); TRACE("ePatchDataType: %u\n", info[i].ePatchDataType); TRACE("dwOrder: %u\n", info[i].dwOrder); TRACE("uStatus: %u\n", info[i].uStatus); } + + if (desc) IXMLDOMDocument_Release( desc ); + return ERROR_SUCCESS; }

1 0