September 2011 - Wine-Commits

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Spanish translation .
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 9dfbd60c37797873f9fa40abf94b0ac162b18156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfbd60c37797873f9fa40abf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:27:34 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Spanish translation. --- po/es.po | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/po/es.po b/po/es.po index ea1fa5d..8be0a79 100644 --- a/po/es.po +++ b/po/es.po @@ -8151,12 +8151,14 @@ msgstr "" "llamante.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Ayuda sobre CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Ayuda sobre CHDIR\n" @@ -8165,22 +8167,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS limpia la pantalla de la consola\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Ayuda sobre COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Ayuda sobre CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Ayuda sobre DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Ayuda sobre DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Ayuda sobre DIR\n" @@ -8205,6 +8212,7 @@ msgstr "" "precediéndolo por un signo @.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Ayuda sobre ERASE\n" @@ -8251,6 +8259,7 @@ msgstr "" "GOTO no tiene efecto cuando se usa interactivamente.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8293,10 +8302,12 @@ msgstr "" "Puede ver la etiqueta de volumen del disco con el comando VOL.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Ayuda sobre MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Ayuda sobre MKDIR\n" @@ -8411,6 +8422,7 @@ msgstr "" "comentario en un archivo por lotes.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Ayuda sobre REN\n" @@ -8420,10 +8432,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Ayuda sobre RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Ayuda sobre RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Ayuda sobre RMDIR\n" @@ -8475,6 +8489,7 @@ msgstr "" "de comando.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Ayuda sobre TIME\n" @@ -8516,6 +8531,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER muestra la versión de cmd que está ejecutando\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Ayuda sobre VOL\n"

1 0

Francois Gouget : msctf/tests: Give time for the messages to arrive.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 8f8760a1a5af46315b69ed383f64df73d441128a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8760a1a5af46315b69ed383… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:16:59 2011 +0200 msctf/tests: Give time for the messages to arrive. --- dlls/msctf/tests/inputprocessor.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 3262c6b..8f409c3 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1993,9 +1993,20 @@ static void test_Compartments(void) static void processPendingMessages(void) { MSG msg; - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + diff = time - GetTickCount(); } }

1 0

Francois Gouget : urlmon/tests: Print the test URLs rather than their index .
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 6ab1d31f04eecec32ac370e842885911b1d8c043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab1d31f04eecec32ac370e84… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:16:06 2011 +0200 urlmon/tests: Print the test URLs rather than their index. --- dlls/urlmon/tests/sec_mgr.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index afd0d97..f94e791 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1677,21 +1677,21 @@ static void test_SecurityManagerEx2(void) zone = URLZONE_INVALID; hres = pCreateUri(uriW, sec_mgr_ex2_tests[i].create_flags, 0, &uri); - ok(hres == S_OK, "CreateUri returned %08x on test %d\n", hres, i); + ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); if(sec_mgr_ex2_tests[i].map_todo) { todo_wine - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x on test %d\n", - hres, sec_mgr_ex2_tests[i].map_hres, i); + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n", + hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); todo_wine - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, - zone, i); + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, + zone, sec_mgr_ex2_tests[i].uri); } else { - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x on test %d\n", - hres, sec_mgr_ex2_tests[i].map_hres, i); - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, - zone, i); + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", + hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, + zone, sec_mgr_ex2_tests[i].uri); } heap_free(uriW);

1 0

Stefan Dösinger : wined3d: Don't load/ unload unsupported texture coordinate attribs.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: efba48ccfb795efe3f2b4d095e2bf1d82bbc9a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efba48ccfb795efe3f2b4d095… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 1 18:20:19 2011 +0200 wined3d: Don't load/unload unsupported texture coordinate attribs. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/state.c | 8 +++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef66a47..b393c69 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2287,6 +2287,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.blends = 1; gl_info->limits.buffers = 1; gl_info->limits.textures = 1; + gl_info->limits.texture_coords = 1; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; @@ -2465,6 +2466,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); gl_info->limits.textures = min(MAX_TEXTURES, gl_max); TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); + glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); + TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords); if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c4e0513..31c62a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3222,7 +3222,7 @@ static void unload_tex_coords(const struct wined3d_gl_info *gl_info) { unsigned int texture_idx; - for (texture_idx = 0; texture_idx < gl_info->limits.texture_stages; ++texture_idx) + for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); @@ -3244,6 +3244,12 @@ static void load_tex_coords(const struct wined3d_context *context, const struct mapped_stage = device->texUnitMap[textureNo]; if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; + if (mapped_stage >= gl_info->limits.texture_coords) + { + FIXME("Attempted to load unsupported texture coordinate %u\n", mapped_stage); + continue; + } + if (coordIdx < MAX_TEXTURES && (si->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)))) { const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1fac908..0325333 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1446,6 +1446,7 @@ struct wined3d_gl_limits UINT lights; UINT textures; UINT texture_stages; + UINT texture_coords; UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers;

1 0

Stefan Dösinger : ddraw: Use a Z format suported by the driver in the visual test.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 081f39044fc62d6b63e072b2ee70db6b5fd3ee77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=081f39044fc62d6b63e072b2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 29 20:30:00 2011 +0200 ddraw: Use a Z format suported by the driver in the visual test. --- dlls/ddraw/tests/visual.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 9026f97..7a39054 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -54,13 +54,24 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx) +{ + DDPIXELFORMAT *zfmt = ctx; + + if(U1(fmt)->dwZBufferBitDepth > U1(zfmt)->dwZBufferBitDepth) + { + *zfmt = *fmt; + } + return DDENUMRET_OK; +} + static BOOL createObjects(void) { HRESULT hr; HMODULE hmod = GetModuleHandleA("ddraw.dll"); WNDCLASS wc = {0}; DDSURFACEDESC2 ddsd; - + DDPIXELFORMAT zfmt; if(!hmod) return FALSE; pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); @@ -106,14 +117,16 @@ static BOOL createObjects(void) hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); if(FAILED(hr)) goto err; + memset(&zfmt, 0, sizeof(zfmt)); + hr = IDirect3D7_EnumZBufferFormats(Direct3D, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &zfmt); + if (FAILED(hr)) goto err; + if (zfmt.dwSize == 0) goto err; + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(ddsd).ddpfPixelFormat).dwZBufferBitDepth = 32; - U3(U4(ddsd).ddpfPixelFormat).dwZBitMask = 0x00ffffff; + U4(ddsd).ddpfPixelFormat = zfmt; ddsd.dwWidth = 640; ddsd.dwHeight = 480; hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &depth_buffer, NULL);

1 0

Henri Verbeet : ddraw: Remove the unused "depthstencil" field from IDirectDrawImpl.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: aa5590b06128521f7580bc38347ac983e3253580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5590b06128521f7580bc383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:39 2011 +0200 ddraw: Remove the unused "depthstencil" field from IDirectDrawImpl. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 6 +----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2c3ab8f..065ef8a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -113,7 +113,6 @@ struct IDirectDrawImpl /* Helpers for surface creation */ IDirectDrawSurfaceImpl *tex_root; - BOOL depthstencil; /* For the dll unload cleanup code */ struct list ddraw_list_entry; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d70e355..10d9dc4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5184,12 +5184,8 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr usage |= WINED3DUSAGE_OVERLAY; } - if (ddraw->depthstencil || (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) - { - /* The depth stencil creation callback sets this flag. Set the - * wined3d usage to let it know it's a depth/stencil surface. */ + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) usage |= WINED3DUSAGE_DEPTHSTENCIL; - } if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) {

1 0

Henri Verbeet : ddraw: Initialize the swapchain presentation parameters in ddraw_create_swapchain ().
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: f3e1a9fa16a9d1c0a112f94531c7ce32fe62cc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e1a9fa16a9d1c0a112f9453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:38 2011 +0200 ddraw: Initialize the swapchain presentation parameters in ddraw_create_swapchain(). --- dlls/ddraw/ddraw.c | 91 +++++++++++++++++++++------------------------------- 1 files changed, 37 insertions(+), 54 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 001a2be..e9aefd9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2730,10 +2730,10 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, * DDERR_* otherwise * *****************************************************************************/ -static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary) +static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary, + WINED3DPRESENT_PARAMETERS *presentation_parameters) { - WINED3DPRESENT_PARAMETERS localParameters; - HWND window = ddraw->dest_window; + HWND window = presentation_parameters->hDeviceWindow; HRESULT hr; TRACE("ddraw %p, primary %p.\n", ddraw, primary); @@ -2751,6 +2751,8 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac ShowWindow(window, SW_HIDE); /* Just to be sure */ WARN("No window for the Direct3DDevice, created hidden window %p.\n", window); + + presentation_parameters->hDeviceWindow = window; } else { @@ -2761,23 +2763,10 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac /* Store the future Render Target surface */ ddraw->d3d_target = primary; - memset(&localParameters, 0, sizeof(localParameters)); - - /* Use the surface description for the device parameters, not the device - * settings. The application might render to an offscreen surface. */ - localParameters.BackBufferWidth = primary->surface_desc.dwWidth; - localParameters.BackBufferHeight = primary->surface_desc.dwHeight; - localParameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); - localParameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) - ? primary->surface_desc.dwBackBufferCount : 0; - localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; - localParameters.hDeviceWindow = window; - localParameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->d3d_initialized = TRUE; - hr = wined3d_device_init_3d(ddraw->wined3d_device, &localParameters); + hr = wined3d_device_init_3d(ddraw->wined3d_device, presentation_parameters); if (FAILED(hr)) { ddraw->d3d_target = NULL; @@ -2800,29 +2789,13 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac return DD_OK; } -static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary) +static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary, + WINED3DPRESENT_PARAMETERS *presentation_parameters) { - WINED3DPRESENT_PARAMETERS presentation_parameters; - HWND window; HRESULT hr; - window = ddraw->dest_window; - - memset(&presentation_parameters, 0, sizeof(presentation_parameters)); - - /* Use the surface description for the device parameters, not the device - * settings. The application might render to an offscreen surface. */ - presentation_parameters.BackBufferWidth = primary->surface_desc.dwWidth; - presentation_parameters.BackBufferHeight = primary->surface_desc.dwHeight; - presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); - presentation_parameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) - ? primary->surface_desc.dwBackBufferCount : 0; - presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; - presentation_parameters.hDeviceWindow = window; - presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - ddraw->d3d_target = primary; - hr = wined3d_device_init_gdi(ddraw->wined3d_device, &presentation_parameters); + hr = wined3d_device_init_gdi(ddraw->wined3d_device, presentation_parameters); ddraw->d3d_target = NULL; if (FAILED(hr)) { @@ -2835,7 +2808,33 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *surface) { + WINED3DPRESENT_PARAMETERS presentation_parameters; + IDirectDrawSurfaceImpl *target = surface; HRESULT hr = WINED3D_OK; + struct list *entry; + + /* Search for the primary to use as render target. */ + LIST_FOR_EACH(entry, &ddraw->surface_list) + { + IDirectDrawSurfaceImpl *primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) + { + TRACE("Using primary %p as render target.\n", target); + target = primary; + break; + } + } + + memset(&presentation_parameters, 0, sizeof(presentation_parameters)); + presentation_parameters.BackBufferWidth = target->surface_desc.dwWidth; + presentation_parameters.BackBufferHeight = target->surface_desc.dwHeight; + presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&target->surface_desc.u4.ddpfPixelFormat); + presentation_parameters.BackBufferCount = (target->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) + ? target->surface_desc.dwBackBufferCount : 0; + presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; + presentation_parameters.hDeviceWindow = ddraw->dest_window; + presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); /* If the implementation is OpenGL and there's no d3ddevice, attach a * d3ddevice. But attach the d3ddevice only if the currently created @@ -2846,28 +2845,12 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface * target creation will cause the 3D init. */ if (DefaultSurfaceType == SURFACE_OPENGL) { - IDirectDrawSurfaceImpl *target = surface, *primary; - struct list *entry; - - /* Search for the primary to use as render target. */ - LIST_FOR_EACH(entry, &ddraw->surface_list) - { - primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - { - TRACE("Using primary %p as render target.\n", target); - target = primary; - break; - } - } - TRACE("Attaching a D3DDevice, rendertarget = %p.\n", target); - hr = ddraw_attach_d3d_device(ddraw, target); + hr = ddraw_attach_d3d_device(ddraw, target, &presentation_parameters); } else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - hr = ddraw_create_gdi_swapchain(ddraw, surface); + hr = ddraw_create_gdi_swapchain(ddraw, target, &presentation_parameters); } return hr;

1 0

Andrew Talbot : openal32: Avoid forward declarations of static arrays.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 42207504a29dfc42ef1ed6688e54aaa85d4f2563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42207504a29dfc42ef1ed6688… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:55 2011 +0100 openal32: Avoid forward declarations of static arrays. --- dlls/openal32/openal.c | 95 ++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 6a8e8f1..ec4149c 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -79,13 +79,8 @@ static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value); static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values); -struct FuncList { - const char *name; - void *proc; -}; - -static const struct FuncList ALCFuncs[]; -static const struct FuncList ALFuncs[]; +extern ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *, const ALCchar *); +extern ALvoid* CDECL wine_alGetProcAddress(const ALchar*); static CRITICAL_SECTION openal_cs; static CRITICAL_SECTION_DEBUG openal_cs_debug = @@ -238,25 +233,6 @@ ALCboolean CDECL wine_alcIsExtensionPresent(ALCdevice *device, const ALCchar *ex return alcIsExtensionPresent(device, extname); } -ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) -{ - void *proc; - int i; - - /* Make sure the host implementation has the requested function */ - proc = alcGetProcAddress(device, funcname); - if(!proc) - return NULL; - - for(i = 0;ALCFuncs[i].name;i++) - { - if(strcmp(funcname, ALCFuncs[i].name) == 0) - return ALCFuncs[i].proc; - } - FIXME("Could not find function in list: %s\n", funcname); - return NULL; -} - ALCenum CDECL wine_alcGetEnumValue(ALCdevice *device, const ALCchar *enumname) { return alcGetEnumValue(device, enumname); @@ -344,27 +320,6 @@ ALboolean CDECL wine_alIsExtensionPresent(const ALchar* extname) return alIsExtensionPresent(extname); } -ALvoid* CDECL wine_alGetProcAddress(const ALchar* funcname) -{ - void *proc; - int i; - - /* Make sure the host implementation has the requested function. This will - * also set the last AL error properly if the function should not be - * returned (eg. no current context). */ - proc = alGetProcAddress(funcname); - if(!proc) - return NULL; - - for(i = 0;ALFuncs[i].name;i++) - { - if(strcmp(funcname, ALFuncs[i].name) == 0) - return ALFuncs[i].proc; - } - FIXME("Could not find function in list: %s\n", funcname); - return NULL; -} - ALenum CDECL wine_alGetEnumValue(const ALchar* ename) { return alGetEnumValue(ename); @@ -883,6 +838,10 @@ static ALCcontext* CDECL wine_alcGetThreadContext(ALCvoid) return alcGetThreadContext(); } +struct FuncList { + const char *name; + void *proc; +}; static const struct FuncList ALCFuncs[] = { { "alcCreateContext", wine_alcCreateContext }, @@ -1023,3 +982,45 @@ static const struct FuncList ALFuncs[] = { { NULL, NULL } }; + + +ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) +{ + void *proc; + int i; + + /* Make sure the host implementation has the requested function */ + proc = alcGetProcAddress(device, funcname); + if(!proc) + return NULL; + + for(i = 0;ALCFuncs[i].name;i++) + { + if(strcmp(funcname, ALCFuncs[i].name) == 0) + return ALCFuncs[i].proc; + } + FIXME("Could not find function in list: %s\n", funcname); + return NULL; +} + + +ALvoid* CDECL wine_alGetProcAddress(const ALchar* funcname) +{ + void *proc; + int i; + + /* Make sure the host implementation has the requested function. This will + * also set the last AL error properly if the function should not be + * returned (eg. no current context). */ + proc = alGetProcAddress(funcname); + if(!proc) + return NULL; + + for(i = 0;ALFuncs[i].name;i++) + { + if(strcmp(funcname, ALFuncs[i].name) == 0) + return ALFuncs[i].proc; + } + FIXME("Could not find function in list: %s\n", funcname); + return NULL; +}

1 0

Jacek Caban : user32: Make GetWindowInfo hotpatchable.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: ab37b86236fcd54be93dcd5e0ca7b52bbcc95aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab37b86236fcd54be93dcd5e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 10 14:13:05 2011 +0200 user32: Make GetWindowInfo hotpatchable. --- dlls/user32/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b61d183..e3e8265 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3395,7 +3395,7 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size ) * * Note: tests show that Windows doesn't check cbSize of the structure. */ -BOOL WINAPI GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) +BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi) { if (!pwi) return FALSE; if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE;

1 0

Andrew Talbot : krnl386.exe16: Constify some variables.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: f0a7bc130815ac01b9bc219a8b67abc4909d1e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a7bc130815ac01b9bc219a8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:50 2011 +0100 krnl386.exe16: Constify some variables. --- dlls/krnl386.exe16/ne_module.c | 14 ++++++++------ dlls/krnl386.exe16/snoop.c | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 95dcab8..2fd367a 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -963,8 +963,8 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ NE_MODULE *pModule; const IMAGE_DOS_HEADER *descr = NULL; const char *file_name = NULL; - char dllname[32], *p; - const char *basename, *main_module; + char dllname[32]; + const char *basename, *main_module, *p; /* strip path information */ @@ -975,12 +975,14 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if (strlen(basename) < sizeof(dllname)-6) { + char *q; + strcpy( dllname, basename ); - p = strrchr( dllname, '.' ); - if (!p) strcat( dllname, ".dll" ); - for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32; + q = strrchr( dllname, '.' ); + if (!q) strcat( dllname, ".dll" ); + for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; - strcpy( p, "16" ); + strcpy( q, "16" ); if ((mod32 = LoadLibraryA( dllname ))) { if (!(descr = (void *)GetProcAddress( mod32, "__wine_spec_dos_header" ))) diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 4b8477c..cef0fda 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -99,7 +99,8 @@ static HANDLE16 xsnr = 0; void SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { SNOOP16_DLL **dll = &(firstdll); - char *s; + const char *p; + char *q; if (!TRACE_ON(snoop)) return; @@ -146,11 +147,11 @@ SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { (*dll)->next = NULL; (*dll)->hmod = hModule; - if ((s=strrchr(name,'\\'))) - name = s+1; + if ((p=strrchr(name,'\\'))) + name = p+1; strcpy( (*dll)->name, name ); - if ((s=strrchr((*dll)->name,'.'))) - *s='\0'; + if ((q=strrchr((*dll)->name,'.'))) + *q='\0'; (*dll)->funhandle = GlobalHandleToSel16(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,WINE_LDT_FLAGS_CODE)); (*dll)->funs = GlobalLock16((*dll)->funhandle); if (!(*dll)->funs) {

1 0