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

Hans Leidekker : wininet: Add tests for setting and retrieving the context value.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 02abc3b216e5ee3243a72472dff6407d73037122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02abc3b216e5ee3243a72472d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:58 2010 +0200 wininet: Add tests for setting and retrieving the context value. --- dlls/wininet/tests/http.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0faeb54..93b3877 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2416,6 +2416,113 @@ static void test_HttpQueryInfo(int port) InternetCloseHandle(hi); } +static void test_options(int port) +{ + HINTERNET ses, con, req; + DWORD size, error; + DWORD_PTR ctx; + BOOL ret; + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + SetLastError(0xdeadbeef); + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, 0); + error = GetLastError(); + ok(!ret, "InternetSetOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, sizeof(ctx)); + ok(!ret, "InternetSetOption succeeded\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, 0); + ok(!ret, "InternetSetOption succeeded\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + ctx = 1; + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, sizeof(ctx)); + ok(ret, "InternetSetOption failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + + size = sizeof(ctx); + SetLastError(0xdeadbeef); + ret = InternetQueryOption(NULL, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %u\n", error); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 1, "expected 1 got %lu\n", ctx); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(con, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 0, "expected 0 got %lu\n", ctx); + + ctx = 2; + ret = InternetSetOption(con, INTERNET_OPTION_CONTEXT_VALUE, &ctx, sizeof(ctx)); + ok(ret, "InternetSetOption failed %u\n", GetLastError()); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(con, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 2, "expected 2 got %lu\n", ctx); + + req = HttpOpenRequest(con, NULL, "/test1", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 0, "expected 0 got %lu\n", ctx); + + ctx = 3; + ret = InternetSetOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, sizeof(ctx)); + ok(ret, "InternetSetOption failed %u\n", GetLastError()); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 3, "expected 3 got %lu\n", ctx); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -2451,6 +2558,7 @@ static void test_http_connection(void) test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port); test_last_error(si.port); + test_options(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Alexandre Julliard : user32/tests: Fix a test failure in desktop mode.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 03b335b92623ec2d5c9a15309a192b4bc2e01977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b335b92623ec2d5c9a15309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 16:28:04 2010 +0200 user32/tests: Fix a test failure in desktop mode. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 85cbcf6..6d67e5c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -185,7 +185,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { WM_GETTITLEBARINFOEX, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, - { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } };

1 0

André Hentschel : atl: Reuse code of AtlModuleRegisterWndClassInfoW for AtlModuleRegisterWndClassInfoA .
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 2d658e656f95070c410db3719ce5d03a4e609daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d658e656f95070c410db3719… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 16:51:00 2010 +0200 atl: Reuse code of AtlModuleRegisterWndClassInfoW for AtlModuleRegisterWndClassInfoA. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/atl/atlwin.h | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 27fb171..73d6ae6 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -37,7 +37,7 @@ 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) -46 stub AtlModuleRegisterWndClassInfoA +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) 49 stub AtlRegisterClassCategoriesHelper diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 75f9a11..788e4de 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -439,6 +439,45 @@ HRESULT WINAPI AtlModuleUnregisterServer(_ATL_MODULEW *pm, const CLSID *clsid) } /*********************************************************************** + * AtlModuleRegisterWndClassInfoA [ATL.@] + * + * See AtlModuleRegisterWndClassInfoW. + */ +ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc) +{ + ATOM atom; + + FIXME("%p %p %p semi-stub\n", pm, wci, pProc); + + atom = wci->m_atom; + if (!atom) + { + WNDCLASSEXA wc; + + TRACE("wci->m_wc.lpszClassName = %s\n", wci->m_wc.lpszClassName); + + if (!wci->m_wc.lpszClassName) + { + static const CHAR szFormat[] = "ATL%08x"; + sprintf(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + TRACE("auto-generated class name %s\n", wci->m_szAutoName); + wci->m_wc.lpszClassName = wci->m_szAutoName; + } + + atom = GetClassInfoExA(pm->m_hInst, wci->m_wc.lpszClassName, &wc); + if (!atom) + atom = RegisterClassExA(&wci->m_wc); + + wci->pWndProc = wci->m_wc.lpfnWndProc; + wci->m_atom = atom; + } + *pProc = wci->pWndProc; + + TRACE("returning 0x%04x\n", atom); + return atom; +} + +/*********************************************************************** * AtlModuleRegisterWndClassInfoW [ATL.@] * * PARAMS diff --git a/dlls/atl/atlwin.h b/dlls/atl/atlwin.h index 4bd1359..386177b 100644 --- a/dlls/atl/atlwin.h +++ b/dlls/atl/atlwin.h @@ -43,7 +43,7 @@ typedef struct _ATL_WNDCLASSINFOW_TAG WCHAR m_szAutoName[14]; } _ATL_WNDCLASSINFOW; -ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc); +ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc); ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW *wci, WNDPROC *pProc); HDC WINAPI AtlCreateTargetDC(HDC hdc, DVTARGETDEVICE *ptd);

1 0

Alexandre Julliard : atl: Fix formatting of generated class name for 64-bit .
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 4e00948efcc46e5ebb26b3fe181cd27fecf80f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e00948efcc46e5ebb26b3fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 17:03:35 2010 +0200 atl: Fix formatting of generated class name for 64-bit. --- dlls/atl/atl_main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 788e4de..f168d54 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -458,8 +458,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - static const CHAR szFormat[] = "ATL%08x"; - sprintf(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -510,8 +509,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { - static const WCHAR szFormat[] = {'A','T','L','%','0','8','x',0}; - sprintfW(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; + sprintfW(wci->m_szAutoName, szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; }

1 0

Sven Baars : winhlp32: Fix Dutch translation.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 9ce0ae1febe66706f0fdc6c798ba34a252947e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce0ae1febe66706f0fdc6c79… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 25 17:49:13 2010 +0200 winhlp32: Fix Dutch translation. --- programs/winhlp32/Nl.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 029d582..4988326 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -31,7 +31,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM "&Openen", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Af&drukken", MNID_FILE_PRINT - MENUITEM "&Printerinstellingen...", MNID_FILE_SETUP + MENUITEM "&Pagina-instellingen...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Afsluiten", MNID_FILE_EXIT } @@ -50,7 +50,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM "Zichtbaar", MNID_OPTS_HELP_VISIBLE MENUITEM "Niet zichtbaar", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "Historie", MNID_OPTS_HISTORY + MENUITEM "Geschiedenis", MNID_OPTS_HISTORY POPUP "Lettertype" BEGIN MENUITEM "Klein", MNID_OPTS_FONTS_SMALL @@ -102,7 +102,7 @@ STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" STID_NO_RICHEDIT "Kan geen richedit implementatie vinden... Actie afgebroken" -STID_PSH_INDEX, "Help onderwerpen: " +STID_PSH_INDEX, "Help-onderwerpen: " } CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -111,8 +111,8 @@ BEGIN BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE MENUITEM "Kopiëren", MNID_CTXT_COPY - MENUITEM "Print...", MNID_CTXT_PRINT - POPUP "Lettertypes" + MENUITEM "Afdrukken ...", MNID_CTXT_PRINT + POPUP "Lettertype" BEGIN MENUITEM "Klein", MNID_CTXT_FONTS_SMALL MENUITEM "Normaal", MNID_CTXT_FONTS_NORMAL @@ -124,6 +124,6 @@ BEGIN MENUITEM "Zichtbaar", MNID_CTXT_HELP_VISIBLE MENUITEM "Onzichtbaar", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS + MENUITEM "Gebruik systeemkleuren", MNID_CTXT_SYSTEM_COLORS END END

1 0

Henri Verbeet : wined3d: Set the state.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: b5cec57690c6f92b8605c79adb409989b72c5c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cec57690c6f92b8605c79ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 25 12:02:03 2010 +0200 wined3d: Set the state.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/state.c | 76 +++++++++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5cec57690c6f92b8605c…

1 0

Henri Verbeet : wined3d: Get rid of GLINFO_LOCATION.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: e8ac9bbd7f5484de9a33c2d6402971274c30ff75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ac9bbd7f5484de9a33c2d64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 25 12:02:04 2010 +0200 wined3d: Get rid of GLINFO_LOCATION. --- dlls/wined3d/arb_program_shader.c | 3 --- dlls/wined3d/ati_fragment_shader.c | 2 -- dlls/wined3d/buffer.c | 2 -- dlls/wined3d/context.c | 2 -- dlls/wined3d/device.c | 1 - dlls/wined3d/directx.c | 1 - dlls/wined3d/drawprim.c | 1 - dlls/wined3d/glsl_shader.c | 2 -- dlls/wined3d/nvidia_texture_shader.c | 2 -- dlls/wined3d/query.c | 1 - dlls/wined3d/state.c | 3 --- dlls/wined3d/surface.c | 2 -- dlls/wined3d/surface_base.c | 3 --- dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/volume.c | 2 -- dlls/wined3d/wined3d_private.h | 2 +- 16 files changed, 1 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 97840e5..0824fed 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,8 +39,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - /* Extract a line. Note that this modifies the source string. */ static char *get_line(char **ptr) { @@ -5873,7 +5871,6 @@ static void gen_ffp_instr(struct wined3d_shader_buffer *buffer, unsigned int sta } } -/* The stateblock is passed for GLINFO_LOCATION */ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWineD3DStateBlockImpl *stateblock) { const struct wined3d_gl_info *gl_info = &stateblock->device->adapter->gl_info; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 344daf6..993ece0 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -28,8 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - /* GL locking for state handlers is done by the caller. */ /* Some private defines, Constant associations, etc. diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 73d5327..daece20 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6eb50f..5304af2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -28,8 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - static DWORD wined3d_context_tls_idx; /* FBO helper functions */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 498efea..7eb9153 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -34,7 +34,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) /* Define the default light parameters as specified by MSDN */ const WINED3DLIGHT WINED3D_default_light = { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 07120ec..ded549a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); -#define GLINFO_LOCATION (*gl_info) #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) /* The d3d device ID */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4978ee5..b36ef5b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -28,7 +28,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); -#define GLINFO_LOCATION (*gl_info) #include <stdio.h> #include <math.h> diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54a78b1..056e9ad 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -39,8 +39,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - #define WINED3D_GLSL_SAMPLE_PROJECTED 0x1 #define WINED3D_GLSL_SAMPLE_RECT 0x2 #define WINED3D_GLSL_SAMPLE_LOD 0x4 diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index d22989d..24cba32 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -28,8 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - /* GL locking for state handlers is done by the caller. */ static void nvts_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 5552bb1..b3c77ea 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,7 +25,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7a4f57f..4c6d5bf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_shader); -#define GLINFO_LOCATION (*gl_info) - /* GL locking for state handlers is done by the caller. */ static void state_blendop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context); @@ -5545,7 +5543,6 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -#undef GLINFO_LOCATION /* Context activation is done by the caller. */ static void ffp_enable(IWineD3DDevice *iface, BOOL enable) { } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ca796c5..0903f6e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION (*gl_info) - static void surface_cleanup(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *device = This->resource.device; diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index b674f9d..2b6cdb4 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -83,9 +83,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } - -/* Do NOT define GLINFO_LOCATION in this file. THIS CODE MUST NOT USE IT */ - /* ******************************************* IWineD3DSurface IUnknown parts follow ******************************************* */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 485329c..b0d591a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); -#define GLINFO_LOCATION (*gl_info) - /*IWineD3DSwapChain parts follow: */ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 693ddd1..42e61e6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -26,8 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); -#define GLINFO_LOCATION (*gl_info) - /* Context activation is done by the caller. */ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 045d068..5c96d76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -748,7 +748,7 @@ extern int num_lock DECLSPEC_HIDDEN; /* GL related defines */ /* ------------------ */ -#define GL_EXTCALL(FuncName) (GLINFO_LOCATION.FuncName) +#define GL_EXTCALL(f) (gl_info->f) #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF)

1 0

Hans Leidekker : server: Map EHOSTUNREACH to STATUS_HOST_UNREACHABLE.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 0a4984280fc6b6f455017d581cc7d5d5b7c7d3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4984280fc6b6f455017d581… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:18:12 2010 +0200 server: Map EHOSTUNREACH to STATUS_HOST_UNREACHABLE. --- server/sock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/sock.c b/server/sock.c index 0c8cb54..9cd0fc2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -817,6 +817,7 @@ static int sock_get_ntstatus( int err ) case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; + case EHOSTUNREACH: return STATUS_HOST_UNREACHABLE; case ENETDOWN: return STATUS_NETWORK_BUSY; case EPIPE: case ECONNRESET: return STATUS_CONNECTION_RESET;

1 0

Hans Leidekker : msi: Get rid of the goto in MSI_ApplicablePatchW.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: c815432a50f024e17427d90de942a96bde9ea63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c815432a50f024e17427d90de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:18:32 2010 +0200 msi: Get rid of the goto in MSI_ApplicablePatchW. --- dlls/msi/msi.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index afa7005..9d8a88a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -541,15 +541,14 @@ static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch ) si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); if (!si) { - r = ERROR_FUNCTION_FAILED; - goto done; + msiobj_release( &patch_db->hdr ); + return ERROR_FUNCTION_FAILED; } r = msi_check_patch_applicable( package, si ); if (r != ERROR_SUCCESS) TRACE("patch not applicable\n"); -done: msiobj_release( &patch_db->hdr ); msiobj_release( &si->hdr ); return r;

1 0

Hans Leidekker : msi: Add a test for properties updated by a patch.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: c2ce56146991ad2786458101d4e11bd6522b703e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ce56146991ad2786458101d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:18:47 2010 +0200 msi: Add a test for properties updated by a patch. --- dlls/msi/tests/patch.c | 65 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 56af5f8..4de2fd0 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -54,7 +54,8 @@ static const char property_dat[] = "UpgradeCode\t{A2E3D643-4E2C-477F-A309-F76F552D5F43}\n" "ProductLanguage\t1033\n" "ProductName\tmsitest\n" - "ProductVersion\t1.1.1\n"; + "ProductVersion\t1.1.1\n" + "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"; static const char media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -708,6 +709,48 @@ static void test_simple_patch( void ) "InstallSource", install_source, &size ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + strcpy( path, CURR_DIR ); + strcat( path, "\\" ); + strcat( path, msifile ); + + r = MsiOpenPackageA( path, &hpackage ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hpackage ); + ok( hdb, "failed to get database handle\n" ); + + query = "SELECT * FROM `Property` where `Property` = 'PATCHNEWPACKAGECODE'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + + query = "SELECT * FROM `Property` WHERE `Property` = 'PATCHNEWSUMMARYSUBJECT' " + "AND `Value` = 'Installer Database'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hpackage ); + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ "expected ERROR_SUCCESS, got %u\n", r ); @@ -721,10 +764,6 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1002, "expected 1002, got %u\n", size ); - strcpy( path, CURR_DIR ); - strcat( path, "\\" ); - strcat( path, msifile ); - /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); @@ -745,6 +784,22 @@ static void test_simple_patch( void ) MsiCloseHandle( hrec ); MsiViewClose( hview ); MsiCloseHandle( hview ); + + query = "SELECT * FROM `Property` WHERE `Property` = 'PATCHNEWSUMMARYSUBJECT' " + "AND `Value` = 'Installation Database'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hdb ); MsiCloseHandle( hpackage );

1 0