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

Alexandre Julliard : wininet/tests: Add even more optional COOKIE_SENT messages.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 80376eacd5c42e34ad629b554617537dad486b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80376eacd5c42e34ad629b554… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 23:40:21 2012 +0200 wininet/tests: Add even more optional COOKIE_SENT messages. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7984f16..6be48a3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -440,8 +440,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_RECEIVED); + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_SENT,2); + SET_OPTIONAL2(INTERNET_STATUS_COOKIE_RECEIVED,2); if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME);

1 0

Alexandre Julliard : urlmon/tests: Allow more COOKIE_SENT notifications.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 7f1b26a0a93f7f198f9bba63389c137088cd408f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1b26a0a93f7f198f9bba633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 23:44:35 2012 +0200 urlmon/tests: Allow more COOKIE_SENT notifications. --- dlls/urlmon/tests/protocol.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9c864e2..a39b8ed 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -583,8 +583,6 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } - else if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) - CLEAR_CALLED(ReportProgress_COOKIE_SENT); switch(state) { case STATE_SENDINGREQUEST: @@ -2998,6 +2996,9 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(prot == HTTPS_TEST) CLEAR_CALLED(ReportProgress_SENDINGREQUEST); + if (prot == HTTP_TEST || prot == HTTPS_TEST) + CLEAR_CALLED(ReportProgress_COOKIE_SENT); + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres);

1 0

Henri Verbeet : ddraw: Get rid of the member_info typedef.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 0f9ccac447dc2930014c2860f0ca89d9800b8933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9ccac447dc2930014c2860f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:35 2012 +0200 ddraw: Get rid of the member_info typedef. --- dlls/ddraw/ddraw_private.h | 6 ++-- dlls/ddraw/utils.c | 58 ++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index cc608bb..0688d07 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -571,13 +571,13 @@ struct flag_info #define FE(x) { x, #x } -typedef struct +struct member_info { DWORD val; - const char* name; + const char *name; void (*func)(const void *); ptrdiff_t offset; -} member_info; +}; /* Structure copy */ #define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 013bd73..d990440 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -740,11 +740,7 @@ DDRAW_dump_pixelformat_flag(DWORD flagmask) DDRAW_dump_flags_nolf(flagmask, flags, sizeof(flags)/sizeof(flags[0])); } -static void -DDRAW_dump_members(DWORD flags, - const void* data, - const member_info* mems, - size_t num_mems) +static void DDRAW_dump_members(DWORD flags, const void *data, const struct member_info *mems, size_t num_mems) { unsigned int i; @@ -821,32 +817,32 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd) { #define STRUCT DDSURFACEDESC2 - static const member_info members[] = - { - ME(DDSD_HEIGHT, DDRAW_dump_DWORD, dwHeight), - ME(DDSD_WIDTH, DDRAW_dump_DWORD, dwWidth), - ME(DDSD_PITCH, DDRAW_dump_DWORD, u1 /* lPitch */), - ME(DDSD_LINEARSIZE, DDRAW_dump_DWORD, u1 /* dwLinearSize */), - ME(DDSD_BACKBUFFERCOUNT, DDRAW_dump_DWORD, dwBackBufferCount), - ME(DDSD_MIPMAPCOUNT, DDRAW_dump_DWORD, u2 /* dwMipMapCount */), - ME(DDSD_ZBUFFERBITDEPTH, DDRAW_dump_DWORD, u2 /* dwZBufferBitDepth */), /* This is for 'old-style' D3D */ - ME(DDSD_REFRESHRATE, DDRAW_dump_DWORD, u2 /* dwRefreshRate */), - ME(DDSD_ALPHABITDEPTH, DDRAW_dump_DWORD, dwAlphaBitDepth), - ME(DDSD_LPSURFACE, DDRAW_dump_PTR, lpSurface), - ME(DDSD_CKDESTOVERLAY, DDRAW_dump_DDCOLORKEY, u3 /* ddckCKDestOverlay */), - ME(DDSD_CKDESTBLT, DDRAW_dump_DDCOLORKEY, ddckCKDestBlt), - ME(DDSD_CKSRCOVERLAY, DDRAW_dump_DDCOLORKEY, ddckCKSrcOverlay), - ME(DDSD_CKSRCBLT, DDRAW_dump_DDCOLORKEY, ddckCKSrcBlt), - ME(DDSD_PIXELFORMAT, DDRAW_dump_pixelformat, u4 /* ddpfPixelFormat */) - }; - static const member_info members_caps[] = - { - ME(DDSD_CAPS, DDRAW_dump_DDSCAPS, ddsCaps) - }; - static const member_info members_caps2[] = - { - ME(DDSD_CAPS, DDRAW_dump_DDSCAPS2, ddsCaps) - }; + static const struct member_info members[] = + { + ME(DDSD_HEIGHT, DDRAW_dump_DWORD, dwHeight), + ME(DDSD_WIDTH, DDRAW_dump_DWORD, dwWidth), + ME(DDSD_PITCH, DDRAW_dump_DWORD, u1 /* lPitch */), + ME(DDSD_LINEARSIZE, DDRAW_dump_DWORD, u1 /* dwLinearSize */), + ME(DDSD_BACKBUFFERCOUNT, DDRAW_dump_DWORD, dwBackBufferCount), + ME(DDSD_MIPMAPCOUNT, DDRAW_dump_DWORD, u2 /* dwMipMapCount */), + ME(DDSD_ZBUFFERBITDEPTH, DDRAW_dump_DWORD, u2 /* dwZBufferBitDepth */), /* This is for 'old-style' D3D */ + ME(DDSD_REFRESHRATE, DDRAW_dump_DWORD, u2 /* dwRefreshRate */), + ME(DDSD_ALPHABITDEPTH, DDRAW_dump_DWORD, dwAlphaBitDepth), + ME(DDSD_LPSURFACE, DDRAW_dump_PTR, lpSurface), + ME(DDSD_CKDESTOVERLAY, DDRAW_dump_DDCOLORKEY, u3 /* ddckCKDestOverlay */), + ME(DDSD_CKDESTBLT, DDRAW_dump_DDCOLORKEY, ddckCKDestBlt), + ME(DDSD_CKSRCOVERLAY, DDRAW_dump_DDCOLORKEY, ddckCKSrcOverlay), + ME(DDSD_CKSRCBLT, DDRAW_dump_DDCOLORKEY, ddckCKSrcBlt), + ME(DDSD_PIXELFORMAT, DDRAW_dump_pixelformat, u4 /* ddpfPixelFormat */) + }; + static const struct member_info members_caps[] = + { + ME(DDSD_CAPS, DDRAW_dump_DDSCAPS, ddsCaps) + }; + static const struct member_info members_caps2[] = + { + ME(DDSD_CAPS, DDRAW_dump_DDSCAPS2, ddsCaps) + }; #undef STRUCT if (NULL == lpddsd)

1 0

Henri Verbeet : d3d8: Add a separate function for d3d8 initialization.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 5a4c15b9d96cda9e8252d1b8d06a4b1bb4ccd346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4c15b9d96cda9e8252d1b8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:36 2012 +0200 d3d8: Add a separate function for d3d8 initialization. --- dlls/d3d8/d3d8_main.c | 32 ++++++++++++++++---------------- dlls/d3d8/d3d8_private.h | 15 ++------------- dlls/d3d8/directx.c | 16 +++++++++++++++- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 46f6a5c..1dd7af1 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -35,27 +35,27 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { - IDirect3D8Impl* object; - TRACE("SDKVersion = %x\n", SDKVersion); - - wined3d_mutex_lock(); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D8Impl)); - - object->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; - object->ref = 1; - object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); +IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) +{ + IDirect3D8Impl *object; - TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); + TRACE("sdk_version %#x.\n", sdk_version); - wined3d_mutex_unlock(); + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate d3d8 object memory.\n"); + return NULL; + } - if (!object->WineD3D) + if (!d3d8_init(object)) { - HeapFree( GetProcessHeap(), 0, object ); - object = NULL; + WARN("Failed to initialize d3d8.\n"); + HeapFree(GetProcessHeap(), 0, object); + return NULL; } + + TRACE("Created d3d8 object %p.\n", object); + return &object->IDirect3D8_iface; } diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index b963abe..6b18c1e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -110,19 +110,6 @@ typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl; typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl; typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl; -/* =========================================================================== - The interfaces themselves - =========================================================================== */ - -/* ---------- */ -/* IDirect3D8 */ -/* ---------- */ - -/***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3D8Vtbl Direct3D8_Vtbl DECLSPEC_HIDDEN; - /***************************************************************************** * IDirect3D implementation structure */ @@ -133,6 +120,8 @@ struct IDirect3D8Impl struct wined3d *WineD3D; }; +BOOL d3d8_init(IDirect3D8Impl *d3d8) DECLSPEC_HIDDEN; + /***************************************************************************** * IDirect3DDevice8 implementation structure */ diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 1debd8f..90ca96d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -378,7 +378,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapte return D3D_OK; } -const IDirect3D8Vtbl Direct3D8_Vtbl = +static const struct IDirect3D8Vtbl Direct3D8_Vtbl = { /* IUnknown */ IDirect3D8Impl_QueryInterface, @@ -399,3 +399,17 @@ const IDirect3D8Vtbl Direct3D8_Vtbl = IDirect3D8Impl_GetAdapterMonitor, IDirect3D8Impl_CreateDevice }; + +BOOL d3d8_init(IDirect3D8Impl *d3d8) +{ + d3d8->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; + d3d8->ref = 1; + + wined3d_mutex_lock(); + d3d8->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); + wined3d_mutex_unlock(); + if (!d3d8->WineD3D) + return FALSE; + + return TRUE; +}

1 0

Henri Verbeet : d3d8: Get rid of IDirect3D8Impl.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: e103a7a52df928e2eec811bf8d12f9931c8c7d80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e103a7a52df928e2eec811bf8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:37 2012 +0200 d3d8: Get rid of IDirect3D8Impl. --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d8/d3d8_private.h | 16 +-- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 272 ++++++++++++++++++++++------------------------ 4 files changed, 139 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e103a7a52df928e2eec81…

1 0

Henri Verbeet : wined3d: Use the wined3d_matrix structure for the identity matrix.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 6b9018ccd23f44a23b3e1038bde4ad7c280cf1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9018ccd23f44a23b3e1038b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:38 2012 +0200 wined3d: Use the wined3d_matrix structure for the identity matrix. --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c659e47..fcf5595 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -52,13 +52,13 @@ const struct wined3d_light WINED3D_default_light = /********************************************************** * Global variable / Constants follow **********************************************************/ -const float identity[] = -{ +const struct wined3d_matrix identity = +{{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, -}; /* When needed for comparisons */ +}}}; /* When needed for comparisons */ /* Note that except for WINED3DPT_POINTLIST and WINED3DPT_LINELIST these * actually have the same values in GL and D3D. */ @@ -1832,7 +1832,7 @@ HRESULT CDECL wined3d_device_set_transform(struct wined3d_device *device, * matrix. The Projection matrix stay projection matrix. */ if (d3dts == WINED3D_TS_VIEW) - device->view_ident = !memcmp(matrix, identity, 16 * sizeof(float)); + device->view_ident = !memcmp(matrix, &identity, sizeof(identity)); if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) device_invalidate_state(device, STATE_TRANSFORM(d3dts)); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 304a326..9544c6f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1108,11 +1108,11 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); /* Set some of the defaults for lights, transforms etc */ - memcpy(&state->transforms[WINED3D_TS_PROJECTION], identity, sizeof(identity)); - memcpy(&state->transforms[WINED3D_TS_VIEW], identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_PROJECTION], &identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_VIEW], &identity, sizeof(identity)); for (i = 0; i < 256; ++i) { - memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], &identity, sizeof(identity)); } state->fb = &device->fb; @@ -1253,7 +1253,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) for (i = 0; i < MAX_TEXTURES; ++i) { TRACE("Setting up default texture states for texture Stage %u.\n", i); - memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], identity, sizeof(identity)); + memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], &identity, sizeof(identity)); state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 976c4f4..6a78b65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -860,7 +860,7 @@ do { debug_d3dformat(si->elements[name].format->id), si->elements[name].stream_idx); } while(0) /* Global variables */ -extern const float identity[16] DECLSPEC_HIDDEN; +extern const struct wined3d_matrix identity DECLSPEC_HIDDEN; enum wined3d_ffp_idx {

1 0

Henri Verbeet : wined3d: Properly check for transformed position in buffer_check_attribute().
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: a331ed032e0a22ae720205f3576e9d5a21e7bfb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a331ed032e0a22ae720205f35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 3 21:49:39 2012 +0200 wined3d: Properly check for transformed position in buffer_check_attribute(). --- dlls/wined3d/buffer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e4f3668..0ee814b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -302,8 +302,14 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (is_ffp_position && format == WINED3DFMT_R32G32B32A32_FLOAT) + else if (is_ffp_position && si->position_transformed) { + if (format != WINED3DFMT_R32G32B32A32_FLOAT) + { + FIXME("Unexpected format %s for transformed position.\n", debug_d3dformat(format)); + return FALSE; + } + ret = buffer_process_converted_attribute(This, CONV_POSITIONT, attrib, stride_this_run); } else if (This->conversion_map)

1 0

André Hentschel : winspool.drv: Also convert printer info for level 8.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 0cf0c28d168ffdb084b6a28386cfe6b667b755dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf0c28d168ffdb084b6a2838… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 3 22:40:09 2012 +0200 winspool.drv: Also convert printer info for level 8. --- dlls/winspool.drv/info.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 297cf7a..33caaad 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1389,6 +1389,7 @@ static void convert_printerinfo_W_to_A(LPBYTE out, LPBYTE pPrintersW, break; } + case 8: case 9: { PRINTER_INFO_9W * piW = (PRINTER_INFO_9W *) pPrintersW;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 3839d224b7ad16836503307671651521208ca44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3839d224b7ad1683650330767… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri May 4 07:36:57 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 36 +++--------------------------------- 1 files changed, 3 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 30873bf..c494807 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-04-19 22:52+0300\n" +"PO-Revision-Date: 2012-05-04 07:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6650,37 +6650,6 @@ msgid "insert disk %s" msgstr "įdėkite diską %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -6731,7 +6700,8 @@ msgstr "" "Pritaikyti pataisą:\n" "\t/p pataisos_paketas [savybė]\n" "\t/p pataisos_paketas /a paketas [savybė]\n" -"Žurnalo ir sąsajos modifikatoriai aukščiau išvardintoms komandoms:\n" +"Žurnalo ir naudotojo sąsajos modifikatoriai aukščiau išvardintoms " +"komandoms:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] žurnalo_failas\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" "Registruoti MSI tarnybą:\n"

1 0

Frédéric Delanoy : Remove reference to obsolete newsgroup in Contributing page
by Jeremy Newman 03 May '12

03 May '12

Module: website Branch: master Commit: 849a0de3e957447841cacd83ec5a8d412079ad4c URL: http://source.winehq.org/git/website.git/?a=commit;h=849a0de3e957447841cacd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 3 01:22:09 2012 +0200 Remove reference to obsolete newsgroup in Contributing page --- templates/en/contributing.template | 38 ++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index d100afc..84989e7 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -6,7 +6,7 @@ <p>It's easy to be a bit overwhelmed when you're new to Wine. Yes there may be a lot of things to do but where should you start? Is there anything simple that can get you started? Is there anything you can do that does not require an intimate knowledge of the Windows API and of - Wine's internals? What if you don't know C? Or if you're not a programmer in the first place?</p> + Wine internals? What if you don't know C? Or if you're not a programmer in the first place?</p> <p>So here are a few projects that might provide you with a starting point. Note that this list is not an official statement of what should be done on Wine or anything. It's just a list of things that are important and useful. In any case we welcome your feedback. Similarly, if you @@ -65,7 +65,7 @@ application (they cannot buy all the applications out there) or do not know it well enough to test it properly.</p> <p>You can help even further by becoming an 'application maintainer', that is by - maintaining that application's entry in the <a href="http://appdb.winehq.org/">Application Database</a>. Many + maintaining that application entry in the <a href="http://appdb.winehq.org/">Application Database</a>. Many applications can be made to run (or run better) by using just the right mix of native (Windows) and built-in (Wine) libraries. By testing the application with various library mix and then documenting your results in the @@ -80,7 +80,7 @@ regularly than ten applications once a year.</li> <li>Report all regressions to wine-devel, and cooperate with the developers to diagnose the issue.</li> - <li>Create and maintain an HOWTO Note on the application page summarizing + <li>Create and maintain a HOWTO note on the application page summarizing all actions required to get the application to run properly, e.g. collected from the comments of visitors on the application/versions pages.</li> <li>Coding skills are <strong>not necessary</strong>.</li> @@ -92,23 +92,23 @@ many bug reports that need to be diagnosed and then many bugs to fix.</p> <p>Thus bug diagnosis and support are two closely related activities that are very important to Wine. So we need people willing to answer the questions - and issues that pop up on the newsgroup, wine-users and Bugzilla, and then + and issues that pop up on wine-users and Bugzilla, and then to triage them:</p> <ul> <li>General Wine issues can usually be answered directly</li> <li>For application-specific issues one may want to check with the application owner (if any) to see if this is a known issue (ideally such - issues should be listed in that application's entry)</li> + issues should be listed in that application entry)</li> <li>Other issues require more work to determine whether the problem is reproducible, specific to some environments, and to obtain logs that Wine developers can use to determine where the problem comes from (requires getting enough of an idea of where the problem comes from to determine which debug options to use). Once this is done, it will be much easier for Wine developers to find the exact source of the bug and - to come up with a fix. If the problem is not quickly resolved on the newsgroup - or wine-users then start a bug report in bugzilla. Search through the + to come up with a fix. If the problem is not quickly resolved on + wine-users then start a bug report in bugzilla. Search through the unconfirmed and new bug reports and get them in proper shape for developers. - Subscribe to to wine bugs (<a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a>) + Subscribe to <a href="http://www.winehq.org/mailman/listinfo/wine-bugs">wine-bugs</a>. This read-only list has all entries for unassigned bugs sent to it. Confirming unconfirmed bugs and suggesting debug channels to try are just some of the tasks that need to be done.</li> @@ -121,12 +121,12 @@ users how to switch from managed to unmanaged window management, how to disable FreeType support, etc.</li> <li>General knowledge of Wine issues, mostly gleaned by following the - mailing lists and newsgroup.</li> + mailing lists.</li> <li>Knowing how to switch from native to built-in libraries and vice versa.</li> <li>Being able to analyze a log to determine which libraries to switch from built-in to native and vice versa would be a plus.</li> </ul> -<p>For more information, see our <a href="http://wiki.winehq.org/BugzillaTriage">bug triage page</a>.</p> +<p>For more information, see our <a href="http://wiki.winehq.org/BugzillaTriage">bugs triage page</a>.</p> <h2 id="devel">Development</h2> @@ -134,8 +134,8 @@ <h3 id="conf_tests">Conformance tests</h3> -<p>The goal of Wine's conformance testing is to make sure that the behavior - of Wine's APIs conforms to that of the corresponding Windows API. As there are many versions +<p>The goal of Wine conformance testing is to make sure that the behavior + of Wine APIs conforms to that of the corresponding Windows APIs. As there are many versions of Windows from 95 to 7 we need people to write tests as well as volunteers to run them on Windows. The test suite is far from complete but every little bit helps.</p> <ul> @@ -186,7 +186,7 @@ from both sides: put traces in your application and in Wine. All this combined together and makes it much easier to detect where Wine is doing something wrong, what and why. Then, since you already know what Wine is supposed to do, you're also in a better position - to provide a fix. You can also test a programming book's examples in Wine. A kit to get + to provide a fix. You can also test the examples of a programming book in Wine. A kit to get started and create Web pages showing the results is available <a href="http://fgouget.free.fr/wine/booktesting-en.shtml">here</a>.</p> <p>Required skills:</p> @@ -194,7 +194,7 @@ <li>Testing</li> <li>Writing bug reports</li> <li>Debugging to fix them if possible</li> - <li>Programming in C/C++ if you want to try compiling the programs with Wine lib</li> + <li>Programming in C/C++ if you want to try compiling the programs with Winelib</li> </ul> <h3 id ="code_review">Perform a focused code review</h3> @@ -208,7 +208,7 @@ This can take some time so one cannot always do it (drop me a line if you think of some specific bug to look for but you don't have time). But it's a nice way to get acquainted with the code and you can actually find bugs without needing months of experience on - Wine's code.</p> + Wine code.</p> <p>But be warned though that since your changes will be scattered throughout Wine they will be scrutinized by many developers. Furthermore since your changes probably will not be direct obvious bug fixes, there may be (founded) resistance. Make sure your @@ -234,7 +234,7 @@ <h3 id="doc">Documentation writing</h3> <p>Wine is in constant need of documentation updates. Wine has its - "<a href="{$root}/site/documentation">Guides</a>," like the Wine User Guide etc. + "<a href="{$root}/site/documentation">Guides</a>", like the Wine User Guide etc. The SGML source of the Guides can be found in a <a href="http://source.winehq.org/git/docs.git"> separate Git tree</a>.</p> <p>Other important documentation items are the README file @@ -256,11 +256,11 @@ <h3 id="localized">Localization work</h3> -<p>We need help translating Wine's resources into foreign languages. What this +<p>We need help translating Wine resources into foreign languages. What this covers is common dialogs such as the 'File Open' or 'Print' dialogs, informational messages such as the crash dialog, some standard error - messages, but also the builtin tools such as Wine's notepad. When not - translated these can really impair Wine's usability for non-English + messages, but also the builtin tools such as Wine notepad. When not + translated these can really impair Wine usability for non-English speakers.</p> <p>Luckily these are now all translated through standard PO files which makes this task relatively easy. For detailed instructions on how to help, see our

1 0